ChangeLog fix (no need to merge to trunk)

Since the change was just quickly reverting a change that does not
have a ChangeLog entry of its own, it's confusing and unnecessary for
the reversion to have a ChangeLog entry.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76eb26e24c4429a9b595e96fd125c4b0e98e39cd..4e944133c9e4271aa0e144caaccedb23c812d12b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,11 +15,6 @@
        we can't verify signature because of missing public key
        (backport for bug#17625).
 
-2014-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-       * progmodes/hideif.el: Undo last change which should only go to trunk
-       (do not merge).
-
 2014-06-26  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/cl-macs.el (help-add-fundoc-usage):